Add MergeMode for toggling highlighting of merge conflicts#218
Open
LucaBernstein wants to merge 8 commits intogardener:mainfrom
Open
Add MergeMode for toggling highlighting of merge conflicts#218LucaBernstein wants to merge 8 commits intogardener:mainfrom
MergeMode for toggling highlighting of merge conflicts#218LucaBernstein wants to merge 8 commits intogardener:mainfrom
Conversation
gardener-prow
bot
added
area/usability
Member
|
/assign |
timuthy
requested changes
Apr 10, 2026
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
gardener-prow
bot
added
cla: no
Introduces `MergeMode` (Silent/Informative) and threads it through `threeWayMerge`, `threeWayMergeSection`, and `threeWayMergeSequence`. In `MergeModeInformative`, when an operator-overridden scalar value differs from the current GLK default, a `# glk default: <value> # <-- glk-managed` line comment is appended to the value node. For complex nodes (mappings/sequences), a head comment on the key node signals the divergence. `WriteComponentVectorFile`, `stripDefaultVersionComments`, and `defaultVersionCommentMarker` are deleted. Their functionality is now covered generically by `WriteObjectsToFilesystem(MergeModeInformative)``, which plain.go already calls directly. The corresponding test describe block is removed along with the now-unused imports. Operator-comments are retained.
…l-sites Existing callers pass `MergeModeSilent` (zero value, no behaviour change). plain.go passes `MergeModeInformative` so the components.yaml file gets GLK default annotations for operator-overridden component versions.
LucaBernstein
force-pushed
the
modifications-merge-conflict-handling
branch
from
c9f08ef to
3ddf8fb
Compare
gardener-prow
bot
removed
the
needs-rebase
gardener-prow
bot
added
size/XXL
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
How to categorize this PR?
/area usability
/kind enhancement
What this PR does / why we need it:
Currently, once a
components.yamlfile is present, its versions will not be updated anymore byresolve plain. This PR makes the glk update non-overridden versions.Also, the "default-value"-handling that until now was only applied to the
components.yaml, has been extended to all manifests by integrating it intoWriteObjectsToFilesystem/ThreeWayMergeManifest.Which issue(s) this PR fixes:
Fixes #210
Follow-up to #216
Special notes for your reviewer:
/cc @timuthy
Release note: